Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

release-23.1: persistedsqlstats: de-flake TestSQLStatsPersistedLimitReached #105930

Merged
merged 1 commit into from
Jul 4, 2023
Merged

release-23.1: persistedsqlstats: de-flake TestSQLStatsPersistedLimitReached #105930

merged 1 commit into from
Jul 4, 2023

Conversation

blathers-crl[bot]
Copy link

@blathers-crl blathers-crl bot commented Jun 30, 2023 •
edited by zachlite
Loading

Backport 1/1 commits from #105917 on behalf of @zachlite.

/cc @cockroachdb/release

TestSQLStatsPersistedLimitReached would previously flake because it did not consider background SQL activity happening in the cluster.

This commit re-writes the test to only make assertions that are not dependent on background cluster activity.

Resolves #105846, #97488
Epic: none
Release note: None

Release justification: Test de-flake

@zachlite
persistedsqlstats: de-flake TestSQLStatsPersistedLimitReached
b1301cd 
TestSQLStatsPersistedLimitReached would previously flake
because it did not consider background SQL activity happening
in the cluster.

This commit re-writes the test to only make assertions that are
not dependent on background cluster activity.

Resolves #105846, #97488
Epic: none
Release note: None
@blathers-crl blathers-crl bot requested a review from a team June 30, 2023 20:07
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-23.1-105917 branch from ac605cf to 3320859 Compare June 30, 2023 20:07
@blathers-crl
Copy link
Author

blathers-crl bot commented Jun 30, 2023 •
edited by zachlite
Loading

Thanks for opening a backport.

Please check the backport criteria before merging:

  • Patches should only be created for serious issues or test-only changes.
  • Patches should not break backwards-compatibility.
  • Patches should change as little code as possible.
  • Patches should not change on-disk formats or node communication protocols.
  • Patches should not add new functionality.
  • Patches must not add, edit, or otherwise modify cluster versions; or add version gates.
If some of the basic criteria cannot be satisfied, ensure that the exceptional criteria are satisfied within.
  • There is a high priority need for the functionality that cannot wait until the next release and is difficult to address in another way.
  • The new functionality is additive-only and only runs for clusters which have specifically “opted in” to it (e.g. by a cluster setting).
  • New code is protected by a conditional check that is trivial to verify and ensures that it only runs for opt-in clusters.
  • The PM and TL on the team that owns the changed code have signed off that the change obeys the above rules.

Add a brief release justification to the body of your PR to justify this backport.

Some other things to consider:

  • What did we do to ensure that a user that doesn’t know & care about this backport, has no idea that it happened?
  • Will this work in a cluster of mixed patch versions? Did we test that?
  • If a user upgrades a patch version, uses this feature, and then downgrades, what happens?

@blathers-crl blathers-crl bot added blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot. labels Jun 30, 2023
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-23.1-105917 branch from a78b6df to b1301cd Compare June 30, 2023 20:07
@blathers-crl blathers-crl bot requested review from j82w and zachlite June 30, 2023 20:07
@cockroach-teamcity
Copy link
Member

This change is Reviewable

j82w
j82w approved these changes Jun 30, 2023
View reviewed changes
Copy link
Contributor

@j82w j82w left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:lgtm:

Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained (waiting on @zachlite)

@maryliag maryliag merged commit dfa1630 into release-23.1 Jul 4, 2023
@maryliag maryliag deleted the blathers/backport-release-23.1-105917 branch July 4, 2023 13:47
@maryliag maryliag mentioned this pull request Jul 4, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@j82w j82w j82w approved these changes

@zachlite zachlite Awaiting requested review from zachlite

Assignees

@zachlite zachlite

Labels
blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@cockroach-teamcity @j82w @maryliag @zachlite